Open the default display even when gtk_parse_args() has already been

        * gtk/gtkmain.c (gtk_init_with_args): Open the default display
        even when gtk_parse_args() has already been called.
        Patch by Mathias Hasselmann

svn path=/trunk/; revision=20366

diff --git a/ChangeLog b/ChangeLog
index 56f6e8462fd2f0957182509fbe81767fbdc1caf5..eb1ef4cb5e67cbc487fa246a8be56b733bf2da2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 537985 – gtk_init_with_args() doesn't open a display after
+       gtk_parse_args()
+
+       * gtk/gtkmain.c (gtk_init_with_args): Open the default display
+       even when gtk_parse_args() has already been called.
+       Patch by Mathias Hasselmann
+
 2008-06-12  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 524222 – GtkToolbar with mix of buttons with and without 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index f844af22c4854a3e43989695df08e1f9bc902e24..3b1e0b1c4bef22535b508bb03f79bdb0d8071c4a 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -819,7 +819,7 @@ gtk_init_with_args (int            *argc,
   gboolean retval;
 
   if (gtk_initialized)
-    return TRUE;
+    return gdk_display_open_default_libgtk_only () != NULL;
 
   gettext_initialization ();